[XEN] Rename machine_shutdown to machine_reboot_kexec to better

reflect its purpose.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>

diff --git a/xen/arch/ia64/xen/machine_kexec.c b/xen/arch/ia64/xen/machine_kexec.c
index 639f845ac1e23dfece21e5ad11577358b26bfe70..df7ad0c9b68506bba5e9c927de36ec0196ad426c 100644 (file)
--- a/xen/arch/ia64/xen/machine_kexec.c
+++ b/xen/arch/ia64/xen/machine_kexec.c
@@ -18,7 +18,7 @@ void machine_kexec(xen_kexec_image_t *image)
     printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
 }
 
-void machine_shutdown(xen_kexec_image_t *image)
+void machine_reboot_kexec(xen_kexec_image_t *image)
 {
     printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
 }

diff --git a/xen/arch/powerpc/machine_kexec.c b/xen/arch/powerpc/machine_kexec.c
index 639f845ac1e23dfece21e5ad11577358b26bfe70..df7ad0c9b68506bba5e9c927de36ec0196ad426c 100644 (file)
--- a/xen/arch/powerpc/machine_kexec.c
+++ b/xen/arch/powerpc/machine_kexec.c
@@ -18,7 +18,7 @@ void machine_kexec(xen_kexec_image_t *image)
     printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
 }
 
-void machine_shutdown(xen_kexec_image_t *image)
+void machine_reboot_kexec(xen_kexec_image_t *image)
 {
     printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
 }

diff --git a/xen/arch/x86/machine_kexec.c b/xen/arch/x86/machine_kexec.c
index 64a4a3f19f710fa482e03db9f3f17bbc8e85a290..81c392a7d313d43650312e518f398ad08146601c 100644 (file)
--- a/xen/arch/x86/machine_kexec.c
+++ b/xen/arch/x86/machine_kexec.c
@@ -52,7 +52,7 @@ void machine_kexec_unload(int type, int slot, xen_kexec_image_t *image)
 {
 }
 
-static void __machine_shutdown(void *data)
+static void __machine_reboot_kexec(void *data)
 {
     xen_kexec_image_t *image = (xen_kexec_image_t *)data;
 
@@ -69,7 +69,7 @@ static void __machine_shutdown(void *data)
     machine_kexec(image);
 }
 
-void machine_shutdown(xen_kexec_image_t *image)
+void machine_reboot_kexec(xen_kexec_image_t *image)
 {
     int reboot_cpu_id;
     cpumask_t reboot_cpu;
@@ -83,13 +83,13 @@ void machine_shutdown(xen_kexec_image_t *image)
     {
         cpus_clear(reboot_cpu);
         cpu_set(reboot_cpu_id, reboot_cpu);
-        on_selected_cpus(reboot_cpu, __machine_shutdown, image, 1, 0);
+        on_selected_cpus(reboot_cpu, __machine_reboot_kexec, image, 1, 0);
         for (;;)
                 ; /* nothing */
     }
     else
     {
-        __machine_shutdown(image);
+        __machine_reboot_kexec(image);
     }
     BUG();
 }

diff --git a/xen/common/kexec.c b/xen/common/kexec.c
index 2c4c079314893f0e4689e0f89a4232a868b62c75..31e581a07f96acffbdf2c7adfb2bd58252e6783e 100644 (file)
--- a/xen/common/kexec.c
+++ b/xen/common/kexec.c
@@ -306,7 +306,7 @@ static int kexec_exec(XEN_GUEST_HANDLE(void) uarg)
     case KEXEC_TYPE_DEFAULT:
         image = &kexec_image[base + pos];
         one_cpu_only();
-        machine_shutdown(image); /* Does not return */
+        machine_reboot_kexec(image); /* Does not return */
         break;
     case KEXEC_TYPE_CRASH:
         machine_crash_kexec(); /* Does not return */

diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h
index cebc2d793a8299c8389ba7ae77d2b5784749a757..c22bfc8f5ed95a714947f61960fbdf688de6aa95 100644 (file)
--- a/xen/include/xen/kexec.h
+++ b/xen/include/xen/kexec.h
@@ -12,6 +12,8 @@ typedef struct xen_kexec_reserve {
     unsigned long start;
 } xen_kexec_reserve_t;
 
+extern xen_kexec_reserve_t kexec_crash_area;
+
 /* We have space for 4 images to support atomic update
  * of images. This is important for CRASH images since
  * a panic can happen at any time...
@@ -24,7 +26,7 @@ typedef struct xen_kexec_reserve {
 int machine_kexec_load(int type, int slot, xen_kexec_image_t *image);
 void machine_kexec_unload(int type, int slot, xen_kexec_image_t *image);
 void machine_kexec_reserved(xen_kexec_reserve_t *reservation);
-void machine_shutdown(xen_kexec_image_t *image);
+void machine_reboot_kexec(xen_kexec_image_t *image);
 void machine_crash_kexec(void);
 void machine_crash_save_cpu(void);
 crash_xen_info_t *machine_crash_save_info(void);